[CF] Go from three sets of OS* decls to two. #2600
+19
−35
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.